Merge pull request #462 from soby-mathew/sm/runtime_console

author danh-arm <[email protected]>

Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)

committer danh-arm <[email protected]>

Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)
author danh-arm <[email protected]>
Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)
committer danh-arm <[email protected]>
Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)
diff --cc include/plat/arm/common/plat_arm.h
Simple merge
diff --cc include/plat/common/platform.h
Simple merge
diff --cc plat/arm/board/fvp/include/platform_def.h
Simple merge
diff --cc plat/arm/common/arm_bl31_setup.c
Simple merge
diff --cc plat/arm/common/arm_pm.c
Simple merge
author	danh-arm <[email protected]>
	Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)
committer	danh-arm <[email protected]>
	Wed, 9 Dec 2015 19:03:06 +0000 (19:03 +0000)
		1	2
include/plat/arm/common/plat_arm.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/common/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/board/fvp/include/platform_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/common/arm_bl31_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/common/arm_pm.c	patch \|	diff1 \|	diff2 \|	blob \| history